refresh patch 04

diff --git a/debian/patches/04_Fixed-OFoptional-by-introducing-OFalign.patch b/debian/patches/04_Fixed-OFoptional-by-introducing-OFalign.patch
index 8b07109dd7d0180e90e30db346f36ebc7959839e..1d9fc5fac1e73f88488566e57f6f2e0b67f08241 100644 (file)
--- a/debian/patches/04_Fixed-OFoptional-by-introducing-OFalign.patch
+++ b/debian/patches/04_Fixed-OFoptional-by-introducing-OFalign.patch
@@ -4,9 +4,9 @@ Date: Fri, 4 Jul 2014 12:02:51 +0200
 Subject: [PATCH] Fixed OFoptional by introducing OFalign?
 --- a/CMake/osconfig.h.in
 +++ b/CMake/osconfig.h.in
-@@ -1165,4 +1165,7 @@
- /* Define if the compiler supports __declspec(align) */
- #cmakedefine HAVE_DECLSPEC_ALIGN
+@@ -1162,4 +1162,7 @@
+ /* Define if we are supposed to use STL's system_error */
+ #cmakedefine HAVE_STL_SYSTEM_ERROR @HAVE_STL_SYSTEM_ERROR@
  
 +/* Define if the compiler supports __declspec(align) */
 +#cmakedefine HAVE_DECLSPEC_ALIGN
@@ -14,7 +14,7 @@ Subject: [PATCH] Fixed OFoptional by introducing OFalign?
  #endif /* !OSCONFIG_H*/
 --- a/config/aclocal.m4
 +++ b/config/aclocal.m4
-@@ -1963,6 +1963,47 @@
+@@ -1922,6 +1922,47 @@
      fi
  ])
  
@@ -64,9 +64,9 @@ Subject: [PATCH] Fixed OFoptional by introducing OFalign?
  dnl This macro checks if a given preprocessor symbol exists and is a string
 --- a/config/configure
 +++ b/config/configure
-@@ -16771,6 +16771,66 @@
-     fi
- 
+@@ -16711,6 +16711,66 @@
+ fi
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __alignof__" >&5
 +$as_echo_n "checking for __alignof__... " >&6; }
@@ -133,9 +133,9 @@ Subject: [PATCH] Fixed OFoptional by introducing OFalign?
  
 --- a/ofstd/tests/toption.cc
 +++ b/ofstd/tests/toption.cc
-@@ -43,6 +43,11 @@
-     COUT << OFalignof(OFoptional<float>) << ' ' << sizeof(OFoptional<float>) << OFendl;
-     COUT << OFalignof(long) << ' ' << sizeof(long) << ' ' << OFalignof(OFoptional<long>) << ' ' << sizeof(OFoptional<long>) << OFendl;
+@@ -38,6 +38,11 @@
+ 
+     OFoptional<int> o0( 3 ), o1, o2( OFnullopt );
  
 +    COUT << OFalignof(OFoptional<char>) << ' ' << sizeof(OFoptional<char>) << OFendl;
 +    COUT << OFalignof(OFoptional<short>) << ' ' << sizeof(OFoptional<short>) << OFendl;